app setup..add devise, add basic controllers, user
model
basic structure and continued setup
fix merge dev ~> master conflicts