Completes basic design
Git ignore database config
Merge branch 'feature/design' into develop
Merge branch 'design' into develop

Conflicts:
	.gitignore
	app/controllers/users_controller.rb
	app/helpers/authentication_helper.rb
	config/initializers/rbconfig.rb