Updating color variables.
Merge pull request #50 from hipsterwannabe/dannyalxndr

combined sign in/up views into one
Merge pull request #51 from hipsterwannabe/ashwebb

Updating color variables.
Fixed navbar link overlap.
added a Sign In navbar, fixed login form
Merge branch 'master' into dannyalxndr

* master:
  Fixed navbar link overlap.
  Updating color variables.

Conflicts:
	app/views/layouts/master.blade.php