add clickable menu items and pg configuration for development
shorten add to cart fade time from 1500 to 1000
merge changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	config/database.yml
slight modification to config/database.yml