here
Merge branch 'master' of github.com:lincolnhack/lincolnhack

Conflicts:
	Gemfile.lock