shorter id
Merge branch 'master' of https://github.com/buffalohackers/WebDrop
Merge branch 'master' of github.com:buffalohackers/WebDrop
getting ready for nate
Merge branch 'master' of https://github.com/buffalohackers/WebDrop
Merge branch 'master' of github.com:buffalohackers/WebDrop into joe