Merge remote-tracking branch 'upstream/master'
Adding back button
Merge remote-tracking branch 'upstream/master'

Conflicts:
	views/pages/user-matches.hbs
Merge pull request #8 from farzinfadamin/master

Adding back button