additional stylings for presentation today
taking secrets and keys to environmental variables
adding gem sweaters.
moving secret key base to env
Changing web server from WebRICK -> Unicorn
Added form
Merge branch 'projects' into develop

Conflicts:
	Gemfile
	config/initializers/devise.rb
Committed changes from develop
Merge pull request #2 from Make-Magazine/projects

Projects into develop
fixing the project search
Added a projects table

more to do later tonight
made some changes to login
Merge branch 'login_flow' into develop

* login_flow:
  made some changes to login
Added categories

also fixed search and added relations in models
pass reset and top register form
Merge branch 'auth-forms' into develop

* auth-forms:
  pass reset and top register form
  Added categories
  Added a projects table

Conflicts:
	app/assets/stylesheets/theme.css.scss
	app/assets/stylesheets/welcome.css.scss
	app/views/welcome/index.html.erb
first registration flow step
added projects table information

you will need to move back
Dosen't need to exist
fixing our font icon setup: moved to icomoon for full control