add upcoming matches
Merge branch 'upcoming-matches' of https://github.com/joekteo/prediktapp into joekteo-upcoming-matches

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'joekteo-upcoming-matches'