Stashing to merge
Merge branch 'master' of github.com:spiman/etoken
Added database.yml to .gitignore