not done, sorry zee, had to test something... :-)
merged all changes to master into my branch
Merge branch 'master' into annie-styling-again

Conflicts:
	views/index.erb
basic styling
resolve merge conflicts
more styling, still need to make a nav bar, re-organize homepage
first release css
Merge pull request #16 from gopher-snakes-2013/annie-styling-again

Roughly styled our website, DON'T HAVE TO MERGE, just DON'T DELETE THIS BRANCH PLEASE :-)