End of Monday

JSON- working
MS to fix html print to screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock