implemented javascript for liveGraph
merge from master(aaron changes)
merge from master(aaron)
merge console for comp page
merge aaron's push to master
aaron merge minor
aaron merge minor
update site wide margins. Add styles to admin views
Merge branch 'jesse'
Merge branch 'jesse'
liveGraph javascript
merge from master
remove alerts
infinite loop fixed
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz into aaron
ace fix
ace fix 2
file was erased with git. readding it
ace editor theme to work on server now.
merge