Merge remote-tracking branch 'origin/master'

Conflicts:
	lovehandles_project.html
	moarconnie.html
	personal.html
	project.html

some unused files deleted
Remote Tracking..I think