Day5
Merge branch 'master' of https://github.com/johncabibbo/adb

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/johncabibbo/adb
Merge branch 'master' of https://github.com/johncabibbo/adb
Merge branch 'master' of https://github.com/johncabibbo/adb
Merge branch 'master' of https://github.com/johncabibbo/adb
day5a