removed a console log
Merge branch 'master' of github.com:christine06/2sided
hey
Merge branch 'master' of github.com:christine06/2sided

Conflicts:
	application/controllers/browse.php
	js/main.js
f
Merge branch 'master' of github.com:christine06/2sided

Conflicts:
	js/main.js
stupid git
Merge branch 'master' of github.com:christine06/2sided

Conflicts:
	application/views/browse.php