TO many changes to think about

We have, however worked out that this codebase is fundmentallty wrong
and should be changed ;0
Merge branch 'master' of https://github.com/jamiehutber/sdapp

Conflicts:
	www/css/style.css
	www/js/sd.functions.js
	www/js/templates.js
	www/js/templates/home.ejs
	www/js/templates/sex.ejs
	www/js/templates/sex/sexTemplate.ejs
	www/js/templates/sex/wank.ejs
	www/js/views/homeView.js
	www/sass/_sex.scss
	www/sass/style.scss