Added more frontp age content
Started angular
Merge branch 'master' of github.com:patrickongwong/harpoon

Conflicts:
	app/styles/main.sass
More content to home page
Added background image
Merge pull request #4 from cassiewang/master

Added front page content