updated .gitignore to ignore
Merge branch 'master' of https://github.com/woolandcandy/Candy-Guide
remove database.yml from being tracked in version control
update .gitignore to ignore database.yml
Add unicorn gem
add database.yml.sample
update gemlock file
Merge pull request #5 from jibone/master

Some setup for production