adding gitignore
Basic exception handling
Merge branch 'master' of https://github.com/gs-lab/hackathon-feb2013-core
Merge branch 'master', remote branch 'origin' into azhar