Merge pull request #1 from gsong/george/angular-example

Modified angular example
Merge pull request #2 from gsong/george/clean-up

Clean up the file structure
Revert "Clean up the file structure"
Merge pull request #4 from kikilin90/revert-2-george/clean-up

Revert "Clean up the file structure"
Merge branch 'master' into george/google-webstarter

Conflicts:
	app.html
	app.js
	static/css/main.css
	styles/app.css
	styles/main.css
Reverse changes from the reverse commit