test is heroku
Merge remote-tracking branch 'remotes/origin/333' into masterHeroku

Conflicts:
	readme
easy2