Signed-off-by: cesaredgar <cesar_velazquez1994@yahoo.com>
Merge branch 'master' of https://github.com/Riverside-City-College-Computer-Science/CSC5_Winter_2014_40375

# By ttendohv (2) and others
# Via fuaadkhan (2) and others
* 'master' of https://github.com/Riverside-City-College-Computer-Science/CSC5_Winter_2014_40375:
  Signed-off-by: fuaadkhan <fuaad321@gmail.com>
  Signed-off-by: ttendohv <vhodnett1@student.rcc.edu>
  Signed-off-by: mlehrjava <mark.lehr@rcc.edu>
  Signed-off-by: ttendohv <vhodnett1@student.rcc.edu>
  Signed-off-by: rpanganiba4 <rpanganiba4@student.rcc.edu>
  Signed-off-by: davidballantyne123@gmail.com <d1619123>