changed a lot of stuff
Merge branch 'master' of https://github.com/smreidy113/PennCourseHelper

Conflicts:
	Methods.py
blah