shaking?
Merge branch 'master' of https://github.com/soliloquial/Big-Red-Hacks-2014

merging
shaking