member
Merge branch 'master' of https://github.com/ObieHackathon/Tutorial

Conflicts:
	config/routes.rb