Initial commit
Merge branch 'master' of github.com:arunsivasankaran/wikistack_prep
Merge branch 'oddur_and_me'
Merge branch 'oddur_and_me'
added footer to the layout.html view template
 added about us page and some zazz
Merge branch 'master' into oddur_and_me

Conflicts:
	routes/index.js
	views/about_us.html