query now includes searching by activity type, category, and name, changed from like to = for efficiency
Adding user authentication and registration
Merge branch 'search-vt' of https://github.com/RecNSWanderStream/wander_stream into search-vt
commit for adbul since aaron is sick at home
Merge branch 'search-vt' of https://github.com/RecNSWanderStream/wander_stream into search-vt
fixing asset form, and adding activity form
Merge branch 'master' into search-vt

Conflicts:
	app/views/layouts/application.html.erb