Merge branch 'master' of https://github.com/TeamZhao/Assignment-Tracker

Conflicts:
	AssignmentTracker/bin/R.txt
	AssignmentTracker/bin/classes/com/example/assignmenttracker/AddAssignmentActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/AddSemesterActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/MainActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$id.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$integer.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$layout.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$menu.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$string.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$style.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$styleable.class
	AssignmentTracker/gen/com/example/assignmenttracker/R.java

Signed-off-by: pilotisafk <valexsvistounov@gmail.com>
Merge branch 'master' of https://github.com/TeamZhao/Assignment-Tracker

Conflicts:
	AssignmentTracker/bin/AssignmentTracker.apk
	AssignmentTracker/bin/R.txt
	AssignmentTracker/bin/classes.dex
	AssignmentTracker/bin/classes/android/support/v7/appcompat/R$bool.class
	AssignmentTracker/bin/classes/android/support/v7/appcompat/R$color.class
	AssignmentTracker/bin/classes/android/support/v7/appcompat/R$dimen.class
	AssignmentTracker/bin/classes/android/support/v7/appcompat/R$id.class
	AssignmentTracker/bin/classes/android/support/v7/appcompat/R$integer.class
	AssignmentTracker/bin/classes/android/support/v7/appcompat/R$styleable.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/AddAssignmentActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/AddCourseActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/AddSemesterActivity$3.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/AddSemesterActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/MainActivity.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$bool.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$color.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$dimen.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$id.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$integer.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$layout.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$menu.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$string.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$style.class
	AssignmentTracker/bin/classes/com/example/assignmenttracker/R$styleable.class
	AssignmentTracker/bin/jarlist.cache
	AssignmentTracker/bin/resources.ap_
	AssignmentTracker/gen/com/example/assignmenttracker/R.java
	AssignmentTracker/res/layout/activity_add_course.xml
	AssignmentTracker/src/com/example/assignmenttracker/AddCourseActivity.java