testing and paths
Merge branch 'master' of
ssh://git@github.com/IsmailMarmoush/Simplicity.git

Conflicts:
	src/main/java/com/marmoush/simplicity/controller/RootController.java