Added redirect from login
Some routing changes
Merge pull request #6 from Screengoose/login-redirect

Login redirect
Added Mark and Charlie branches