I hope this fixes everything
Merge branch 'master' of git://github.com/Rosti-Axios/ozp-demo into Rosti-Axios-master

Conflicts:
	.gitignore
Merge branch 'Rosti-Axios-master'
adding angular-animate to bower for stockTrader app