staging for merge
staging for commit
staging for commit, again.
Merge pull request #80 from cblokker/master

merging
Merge pull request #81 from eshem/master

cleaned up css
testing
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
fixed email bug
pulling from upstream
Merge pull request #82 from cblokker/master

fixed bug in message model
fixed merge conflicts
fixed merge conflicts
stylized the tweets page
Merge pull request #83 from cblokker/master

stylized the tweets page
fixed merge conflicts