fuck, this is the right version
hooray normandy
added some code
Merge branch 'master' of http://github.com/kevinychen/infolounge

Conflicts:
	node/public/javascripts/tech.js
	node/public/stylesheets/style.css
	node/views/index.ejs