Added stuff to design
Merge branch 'development' of https://github.com/jzhu98/codeday2014 into development