first commit, remove break
basic views styled
updated a few views for devise with boostrap
merged in master and ran tests
fixed merge conflict