Changes added...

Silly but effective.
rolling stuff back

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'