new features + changes!
another merging
Merge branch 'master' of https://github.com/sadekj/MEETAlumniCompetition2013