Initial checkin
Making sure the inital checkout compiles correctly
Adding in the slides
Delete AndevCon2014Presentation.pdf
Delete remove.png
Delete profile.jpg
Updating slides, hopefully the last time
Fixing the layout order
Merge branch 'Task5' into Task6
Merge branch 'Task6' into Task7
Merge branch 'Task7' into Task8
Merge branch 'Task8' into Task9
Merge branch 'Task9' into Task10
Merge branch 'Task10' into Task11

Conflicts:
	app/src/main/res/layout/activity_main.xml
Updating the app to use more current build versions
Merge branch 'master' into Task5

Conflicts:
	app/build.gradle
	app/src/main/java/com/jimbaca/example/customviewgroup/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/menu/main.xml
	app/src/main/res/values/styles.xml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	slides/slides.pdf
Merge branch 'Task5' into Task6
Merge branch 'Task6' into Task7
Merge branch 'Task7' into Task8
Merge branch 'Task8' into Task9