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
add ace. reconfig routes.
remove bad gem. recreate schema.rb
Restore db/schema.rb
fixing up css to these pages. Also fixed a turbolinks issue by includeing jquery.turbolinks gem.
updated css across site. fixed turobolink issue.
Updated devise view with new css format. Started on email backend.
update competition page layout
adjusted competition css and footer margin site wide.
Undo all admin model work because there is a much better way of doing this
Merge branch 'master' into jesse - bringing branch up to date