Merge branch 'master' of C:\xampp\htdocs\2014studentsguardians_Kieran with conflicts.
Merge remote-tracking branch 'origin/master'
Added comment