made tiny changes
improved page after game
redesigned front page, but it broke
Fixed the welcome page
Fix front page and sign up page issues
add rmagic gem
finished big merge
fully functional merge