Escape Project 10/3/13
Merge branch 'master' of https://github.com/ericcd/CIT260section2.git