Merge branch 'tjblonsk-master'

Conflicts:
	Gemfile.lock
nav bar altered
individual page color and borders fixed
changed devise config key