ok
clean
.project
readme
Merge branch 'master' of https://github.com/nsanitas/myMeanProject.git

Conflicts:
	README.md