Initial commit: devise, static pages
Merge conflicts fixed