Updated intro overview
fix merge conflictS
Added git and heroku to welcome preso
Updated overview preso