Initial commit
Bugfixing
Removed all traces of previous software
Post Merge

Merge branch 'master' of ssh://zeus:/git/showtime-web

Conflicts:
	application/config/database.template
Post merge
Removed old templates
Bugfixes and the like
Merge branch 'master' of ssh://zeus.scripter.se/git/showtime-web
bugfixes
Merge branch 'master' of ssh://zeus.scripter.se/git/showtime-web
Merge github.com:tinyMrChaos/showtime