Added angular stuff
css merge
Merge branch 'master' of https://github.com/zerojuan/trainguide-ph-app

Conflicts:
	views/index.jade