consolidation

consolidated all methods into the
simplush.cpp source file.
except for thriller.c
updated makefile
continued working on simplush.cpp