11-13-13 pd 7 minutia
Merge branch 'master' of https://github.com/stuycs-softdev/stuycs-softdev.github.io