Update deploy script to remove git-ssh in new location
added/installed forem. updated footer and header with main_app. to correct paths
merge
background image is fixed now to 1600px width
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz
added forem views + started css for those views
fixed all a link css issues
Try to add admin model (again)
DB migration
Header detects when admin is logged in
Attempt to make admin also forem admins
create about us page, contact us, privacy, termsOfService, and liveGraph with highcharts.
create about us page, contact us, privacy, termsOfService, and liveGraph with highcharts.
remove security page
competition page init, page layout ok
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz into aaron

Conflicts:
	config/routes.rb
	db/schema.rb
FUCK GIT, added my route to config routes.rb
New layout for entire site. Gray background.
Merge branch 'aaron'

Conflicts:
	config/routes.rb
added ace