Updated readme, combined main program