Fix misspelled reading name (android-activities).
Merge branch 'master' of github.com:Grinnell-CSC207/tao-of-java

Whoops.  Lots of pulls from upstream.

Conflicts:
	readings/android-activities.sect
Fix of android activities after faulty merge.
Minor update to arrays reading.
Update the first set of labs to use command-line git rather than Eclipse git.
Minor updates to reading on git.
Update Eclipse lab to use my new code conventions and to load course formatter.
Updates to command-line git lab for a new semester.  Primarily reformat of code.
Minor updates to reading on 'Simple Java for C Programmers' - reformat code, update some text.
Minor updates to reading on Eclipse.
Update code in the intro java reading.