update
Merge branch 'master' of https://github.com/nathanjohnson320/GowlTender

Conflicts:
	Gemfile.lock
Changed parent() to closest()