removed header size
adding git pull master
updated index/contact page using bootstrap and grid system. Added email glyph to each team member
index/contact page, increased sizes for glyphs fa-2x
added links to email, facebook, twitter and github glyphs. Links will open in new tab. Changed size of glyphs to 2x
accidentally removed glyphs
added small personal blurbs about each team member index/comment
modified about information
removed merge conflict
Worked on pop up deals.
Added Maze Game into Rails App- not connected yet.
Moved Game Index file into views
Added files, not working... Waiting for Carlos
'
Fixed the Notifications to work better now
Merge pull request #4 from Rockster160/backgrounds

Modified index/contact page
Created a canvas element and a glimmer display for the money when it updates.
Merge branch 'master' of https://github.com/Rockster160/Capstone into twitterapi

Conflicts:
	db/schema.rb
Stupid DS Store...
Merge branch 'master' of https://github.com/Rockster160/Capstone into twitterapi
Removed broken file.