more set-up
Merge branch 'master' of
https://github.com/irs1318dev/irs1318_2014Fall.git