Signed-off-by: Cynthia01 <Cyn_141@hotmail.com>
Merge branch 'master' of https://github.com/Riverside-City-College-Computer-Science/Summer14_CSC5_46024
Merge branch 'master' of https://github.com/Riverside-City-College-Computer-Science/Summer14_CSC5_46024