merge conflict
2 new views and skeleton for authcontroller