Merge branch 'master' into matt-local
Merge branch 'master' into matt-local
Added M2 homework files (with 6th person added where necessary)
Merge M2 homework, you'll have to add it as a new (non-android) project in Eclipse