about us
Merge branch 'master' of https://github.com/ionuts1704/yatm

Conflicts:
	client/app/views/aboutus.html