uncommented out one line
Merge branch 'bug-fix-for-votes'
tracking .lock file now
Merge branch 'master' of https://github.com/fox-squirrels-2013/brickbat
fixed normalize
added countdown feature to send posts, also changed migrations and tweets now send including the hashtags and mentions
merged me and tyler
merged everything successfully
Merge pull request #23 from fox-squirrels-2013/merge-me-and-tyler

Merge me and tyler