Favourite Button doesn't show up for self or already favourited
Favourite Button doesn't show up for self or already favourited
Merge branch 'test2' of github.com:csb324/getdated into test2

Conflicts:
	app/models/user.rb
User can't favourite themselves, dawg
Merge branch 'test2'

Conflicts:
	app/models/user.rb
	app/views/layouts/application.html.erb