Files removed
Merge branch 'master' of https://github.com/clayliddell/mywebsite

Conflicts:
	Thumbs.db