Added logo to navbar
Merge pull request #2 from cassiewang/logo

Added logo to navbar
Started angular
Merge branch 'master' of github.com:patrickongwong/harpoon

Conflicts:
	app/styles/main.sass
More content to home page