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