test commit
Revert "test commit"

This reverts commit a9f035d5ce1074475c5a49d9b2b20c9d4a1b45fa.
-converted all erb files to haml
-update login process to be able to use username or email to login
-display flash messages