shows what's up next (thanks @mgarbacz for the suggestion)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/app.js