private public working 2
private public working 3
wednesday morning
Merge branch 'master' of https://github.com/sociallyRK/linqs

Conflicts:
	app/controllers/links_controller.rb