Testing dev

I'm going to merge the basic test into master, as a starting point for testing C++ assignments.