Split angular and chrome into two servers.
Merge branch 'master' of https://github.com/HowlingEverett/original-boat-person

Conflicts:
	app/webroot/app/views/story.html
Merge branch 'master' of https://github.com/HowlingEverett/original-boat-person