Updated routes, removed index.html.haml
Updated tests, added User controller
Finish layout & routes