ng animate test
lolz
Merge branch 'master' of https://github.com/castor385/episodealert

Conflicts:
	public/templates/profile.html