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

diff --combined templates/template.cpp
index 07c3065,b90aadd..b90aadd
--- 1/templates/template.cpp
--- 2/src/templates/template.cpp
+++ b/templates/template.cpp
@@@ -15,6 -15,7 +15,7 @@@
   *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
+ #include "temp.h"
  
  /// ***** Private Method Headers *****
  /// ***** Private Variables *****