finished heavy lifting
removing old files
last checkin before copy update
Merge branch 'master' into first-draft

Conflicts:
	Gemfile
	Gemfile.lock
	source/index.html