.
Merge branch 'master' of https://github.com/journeystone/rockit
Some bullshit
Merge branch 'master' of https://github.com/journeystone/rockit
.
Doesn't fucking work yet
..
Unfinished core.js
Merge branch 'master' of https://github.com/journeystone/rockit

Conflicts:
	rockhq/home/forms.pyc
	rockhq/home/models.pyc
	rockhq/home/static/css/main.css
	rockhq/home/templates/home/home.html
	rockhq/home/views.py
	rockhq/home/views.pyc
	rockhq/rockhq/settings.py
	rockhq/rockhq/urls.pyc
	rockhq/sqlite_data