next
Merge branch 'master' of https://github.com/Powder/arthackday2013

Conflicts:
	index.js
	views/index.ejs