Awesome changes..
Merge remote branch 'origin/master'

* origin/master:
  Awesome stuff.

Conflicts:
	public/index.html