final merge
Merge branch 'master' of https://github.com/vluwer/2014-Hackathon
pull request
Merge pull request #1 from sanghal/master

final merge