heroku testing with 11-04 date
Merge branch 'master' of github.com:donnieberg/hiplink_v1

Conflicts:
	lib/tasks/.links.rake.swp