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

fixed bug in message model