Moved "my_account" to "account"
Merge branch 'jm/account' of https://github.com/jmccartie/pairs into jmccartie-jm/account

Conflicts:
	config/routes.rb
Merge conflicts