Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 3 insertions, 0 deletions

diff --git a/index.php b/index.php
index e69de29..cf60860 100644
--- a/index.php
+++ b/index.php
@@ -0,0 +1,3 @@
+<?php
+phpinfo();
+?>