Merge branch 'master' of ssh://pgornicz@cpu22.student.cs.uwaterloo.ca/~/.git-repos...

diff --combined src/config/reader.cpp
index f3dbdd1,d29f8b0..e8757dd
--- 1/src/config/reader.cpp
--- 2/src/config/reader.cpp
+++ b/src/config/reader.cpp
@@@ -19,10 -19,6 +19,10 @@@
  #include "../debug.h"
  
  #include <iostream>
 +using std::cerr;
 +using std::cout;
 +using std::endl;
 +
  #include <fstream>
  #include <string>
  
@@@ -43,7 -39,7 +43,7 @@@ void createKeyMap()
  /// ***** Private Variables *****
  
  const char* configDir = "configs/";
- const char* testFile = "test2.cfg";
+ const char* testFile = "keys.cfg";
  
  /// ***** Public Methods *****