Board stuff
Merge branch 'master' of https://github.com/kartikluke/goodwork

Conflicts:
	Gemfile