deleted unnecessary files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ad stuff.odt