beta1

cleaned up the folders, pep8’ed the files, and commented
waiting for auto test on Wednesday
Merge branch 'master' of https://github.com/sinoforever/Assignment-2

Conflicts:
	Course_sun.py
	Planning_sun