fixed merge conflict
clearing commits
Merge branch 'master' of github.com:cdbajorin/sportscast
registration form css and flash messages fixed
Merge pull request #23 from mrwilsondj/master

Css fixes to login forms