* merging.
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
* add web config to gitignore.