Merge pull request #41 from MooreJesseB/master

Merging all night long!
more merge issues
128am
131am
239am
Merge pull request #42 from sbokaie/master

grids not perfect
Styling. Merge issues
Style merge conflcts
Background color style