something

something
backbone added and includes classes

code/backbone.php added and now automatically includes all Classes.
Merge branch 'master' of github.com:El-Wilio/konfirmed
iok
general update
Merge remote-tracking branch 'origin/master' into chris
backbone added and includes classes

code/backbone.php added and now automatically includes all Classes.
general update
Register working
small update.

need for merging to master.
Merge remote-tracking branch 'origin/chris'

Conflicts:
	code/backbone.php
	webroot/test.php
Merge branch 'william'

-m "some webroot stuff!"
Committing to pull from Master
Merge remote-tracking branch 'origin/master' into chris
yeah 3

yeah 3
yeah 4?

yeah
fuck you

Merge branch 'william' into chris
fuck
Merge branch 'chris' of github.com:El-Wilio/konfirmed into chris
changed stuff