Add username
Merge branch 'photos_and_sets'
Cleaned up styling and links
Merge branch 'master' into cleanup
Permissions with CanCan