first release
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
fixed safe html problem
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod

Conflicts:
	sqlite3.db
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod

Conflicts:
	sqlite3.db
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod
Merge branch 'master' of http://github.com/Chrysothemis/SpaceGoats into prod