Signed-off-by: cesar2661 <obeso@juno.com>
Merge branch 'master' of https://github.com/Riverside-City-College-Computer-Science/CSC5_Spring_2014_42450.git

Conflicts:
	ml1150258/TruthTable/nbproject/private/private.xml

Signed-off-by: cesar2661 <obeso@juno.com>