Making a change to test new rake task.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Making a change to test new rake task.

Conflicts:
	demo/demo.html
Fix merge issue
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix merge issue
  Making a change to test new rake task.

Conflicts:
	demo/demo.html