Merge branch 'tjblonsk-master'

Conflicts:
	config/initializers/devise.rb
edited tags search result box
Merge pull request #12 from tjblonsk/master

added styling to buttons
changed fonts
changed fonts
Merge remote-tracking branch 'upstream/master'
vendor compiled assets