modified:   static/css/main.css
	modified:   static/css/main.css
Merge pull request #2 from ericlindley/master

Edits here and there