Comment in Application.html
Properties Tab Changes
Merge branch 'master' of https://github.com/tstaunton/iteration1

Conflicts:
	config/routes.rb