Jobz
Merge branch 'master' of github.com:trappist/rewardrocket

Conflicts:
	app/models/post.rb