Merge pull request #31 from fiery-skippers-2014/master

fixed login form issue
Merge pull request #32 from fiery-skippers-2014/styling

Styling
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'master' into error_pages
random extra apostrophe removed