Merge pull request #76 from neraken/master

user search
Gemfile
Fix Gemfile merge issue
Added forum
Update README.markdown
Update README.markdown
made edit page prettier and added a log out butn at the top
made the edit page prettier and added a log-out butn at top
Merge pull request #84 from ZiyiChen/master

made edit page prettier and added a log out butn at the top
Added forum and terms page
Fix edit user
New logo
Merge branch 'master' of https://github.com/jamessteininger/ProjectDoge

w
:wq
:
commit.
Update README.markdown
added dogecoin_intro page
Merge pull request #90 from ZiyiChen/master

added dogecoin_intro page
added the wallpapers and added question mark after balance
Merge pull request #91 from ZiyiChen/master

added the wallpapers and added question mark after balance
resized item/dogemon image sizes so they dont break well
added truncates to several places (item, pet, leaderboard)