Merge pull request #38 from ZooTypers/master

updating david's changes
Merge pull request #39 from ZooTypers/master

updating for codepro
Merge pull request #9 from ZooTypers/master

Getting most recent version.
ran codepro and fixed minor website/logging stuff
Merge pull request #215 from winglam/master

ran codepro and fixed minor website/logging stuff
Merge pull request #10 from ZooTypers/master

Getting most recent version.
Some testing changes.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git

Conflicts:
	ZooTypers/reliability/options-log.txt
	ZooTypers/website/status.js
Update .gitignore
Update .gitignore
Merge pull request #40 from ZooTypers/master

updating for apk
committing apk to repo
Merge branch 'master' of https://github.com/winglam/ZooTypers-1.git
committing apk
Merge pull request #216 from winglam/master

committing apk for phase4
Committing some final testing changes.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git
Merge pull request #11 from ZooTypers/master

Getting most recent version.
Merge pull request #217 from dyxliang/master

Pushing updates.
Merge pull request #7 from ZooTypers/master

oak