initial commit
fixing conflicts
updating last work
devise bugs