second commit!
Merge branch 'master' of github.com:givingsheart/mean

Conflicts:
	README.md