Add random rectangles
Resolve conflicts
Merge branch '3-random-rectangles' into development

Conflicts:
	public/javascripts/script.js
	public/stylesheets/style.css