cleaning for pull
Merge branch 'master' of https://github.com/panicbus/lincolnlabs_hackathon2