Finished first version of nested rules
Before pulling for server changes
Merge branch 'master' of https://github.com/hchiao/stepping-stones

Conflicts:
	app/controllers/path_controller.rb