merge conflict
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/SWTI2014/SWTI2014-Project-11
Merge remote-tracking branch 'origin/master'
printf-debugging