trying heroku for server; commented out postgres-related code for workability
added break between login and search
attempting to start searching for products
Merge branch 'test' of https://github.com/DJchopstix13/In2Indie into test
favicon fix
fixing issue with heroku and favicon
fixing issue still
fixing issue with heroku
forgot about rename
changed favicon names at jade files
heroku issues
Merge branch 'master' of heroku.com:in2indie into test

Conflicts:
	app.js
	package.json
Merge branch 'test'

Conflicts:
	app.js
	web-client/views/index.jade
	web-client/views/layout.jade