Hi!
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel

Conflicts:
	Application/ENG-Schedule-Planner/project.properties
	.git/MERGE_HEAD

	modified:   Application/ENG-Schedule-Planner/project.properties
	modified:   Application/ENG-Schedule-Planner/src/com/example/eng_schedule_planner/scheduleActivity/ClassButton.java
	modified:   Application/ENG-Schedule-Planner/src/com/example/eng_schedule_planner/scheduleActivity/ScheduleActivity.java
	deleted:    Application/ENG-Schedule-Planner/src/com/example/eng_schedule_planner/scheduleActivity/TapButton.java
	modified:   Application/ENG-Schedule-Planner/src/com/example/eng_schedule_planner/scheduleActivity/YearView.java
	modified:   Application/ENG-Schedule-Planner/src/courseModel/CourseModel.java
	new file:   parser/python/#parserv2.py#
	new file:   parser/python/.#parserv2.py
	modified:   parser/python/courses.xml
	modified:   parser/python/parserv2.py
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel