database.yml
Merge branch 'master' of github.com:mikereinhart/lost_tribes2
Merge branch 'master' of github.com:mikereinhart/lost_tribes2
eliminated confirmable and put MY PAGE link for user on home page