Finished talk activity layout
Added first list adapter
updated my gitignore
Merge branch 'richard_dev'

Conflicts:
	TedXEventApp/src/main/res/values/dimens.xml
	TedXEventApp/src/main/res/values/strings.xml
Merge branch 'alex_dev'

Conflicts:
	TedXEventApp/src/main/res/values/dimens.xml
removed duplicate strings
Hopeful commit of andy work
Merge branch 'master' into andy_dev
Added the beginning models
structure of the models
Created SDK
Added listview_sponsor.xml layout to hold the sponsor image downloaded from the server.
Added sponsors to list but doesn't work yet
Added sponsors to list but doesn't work yet
Andy screens
added the first draft of the sdk
Merge branch 'master' of https://github.com/TEDxCT/tedx_android into andy_dev

Conflicts:
	TedXEventApp/src/main/java/com/tedx/capetown/app/presentation/activity/HomeActivity.java
addded build file for the sdk
Merge branch 'master' into richard_dev

Conflicts:
	TedXEventApp/src/main/java/com/tedx/capetown/app/presentation/activity/SponsorsActivity.java
Fixed repo so issues do not exist