pacifying git.
Merge branch 'master' of https://github.com/21tag/AngularRecess

Conflicts:
	public/index.html