IDEKOKAY
Merge branch 'master' of github.com:sadekj/MEETAlumniCompetition2013
This will cause a conflict...
Merge branch 'master' of github.com:sadekj/MEETAlumniCompetition2013