Lots of updates
Deleted Spam
Fix Conflicts

Conflicts:
	index.html
	js/scripts.js