Finish layout and routes
Saving all changes before merging branches
installed annotate
Make a basic User model (including secure passwords)