Merge branches 'master' and 'new_feature' into new_feature

diff --git a/readme b/readme
index ac44850..7f1345c 100644 (file)
--- a/readme
+++ b/readme
@@ -15,6 +15,3 @@ If you wish to have code you've developed added to the ATutor public source code
 
 See: http://wiki.atutor.ca/display/atutorwiki/Using+Git+and+GitHub
 
-
-
-