edit properties and property.
Merge branch 'JW' of github.com:davincicoders/2013-q2-rails-1 into JW
pushing base ruby project.