add foreman
Merge branch 'master' of github.com:krisleech/jukebox

Conflicts:
	Gemfile.lock