bootstrap
flikr stuff
Merge branch 'master' of https://github.com/NUDelta/Waitsourcing