Nothing important
Merge branch 'master' of https://github.com/whysoseriousness/pouch_rails
Added scraper
Merge branch 'master' of https://github.com/whysoseriousness/pouch_rails

Conflicts:
	log/development.log
added htmlentities gem