Added gem: bootstrap-sass
Added bootstrap @import line
required bootstrap in js file
Merge pull request #7 from OffTempo/bootstrap

setup bootstrap w/ no frills or customization
Added editing capability to audio_posts, setup audio_posts display
uncommented the devise secret key
• Re-set production enviornment location
• rails g'd user
• rake db:migrated
Changed devise mailer email config to support@offtempo.com
Set email: support@offtempo.com as unique email
removed :admin route
Merge branch 'auth'

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'delete_edit'
Added Pages controller and a login page
Added partial for the site header containing nav links, included it into application.html.erb, created login page
Added about page, converted spaces to tabs
include Devise::TestHelpers
Merge pull request #10 from OffTempo/setup_login

Error fixed. Used this stackoverflow help: http://stackoverflow.com/a/9918859
Merge branch 'master' into admin

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'admin' of github.com:OffTempo/offtempoV4 into admin

Conflicts:
	Gemfile
	Gemfile.lock