Some cleanup, commenting, and bug fixes in grade
Some cleanup, commenting, and bug fixes in student
Merge remote-tracking branch 'upstream/master'

Conflicts:
	grade.py
Merged upstream
Merge branch 'master' into code_cleanup

Conflicts:
	grade.py
Fixed botched merge
Merge branch 'master' into code_cleanup

Conflicts:
	grade.py
Simplified Code and and added comments
Merge remote-tracking branch 'upstream/master'

Conflicts:
	grade.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cliforms.py
	grade.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cliforms.py
	grade.py
Bug fix: CLI would not continue past folder selection if folder was not given at command line
Bug Fix: Wrong arguments passed to do_builds
Merge pull request #10 from DragonFire168/master

Housecleaning: Sync masters