second commit from tamer
Merge branch 'master' of https://github.com/tamerelsayed/AIESEC-APP