updated readme
fixed conflict
Merge branch 'master' of https://github.com/blakeqd/sample_app
Merge branch 'master' of https://github.com/blakeqd/sample_app
Merge branch 'master' of https://github.com/blakeqd/sample_app
vendor compiled assets
updating Caelio layout
update homepage layout as mockup
Add remember me functionality, begin forgot password
added new files
vendor compiled assets
Forgot password button fully functional
almost done state machine user
state machine functionality working
signup pade rearanged
vendor compiled assets
resend activation email
asdfasdfadsf
add sites controller and model, each site clickable
deleting user sites stay on same page