modified gitignore
Merge branch 'upmaster'
Merge branch 'master' of https://github.com/Opportunity-Hack-San-Jose-2014/Jasmin into upmaster
Merge branch 'upmaster'
adjusted try/catch
Merge pull request #11 from lmarkus/master

ad