added upstream
Merge branch 'master' of github.com:AfricaHackTrip/africahacktrip.github.com
putting in 5apps