Merge pull request #18 from eas604/master

bugs
I relied on broken CSS and now I work on drinking day.

I blame everybody
Merge pull request #25 from TEAM2-ISC567-FALL14/master

....