Just ganna leave it commented out instead..
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Changed it to production database.
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebAim.iml
	src/main/java/com/aim/controller/CoursesController.java
	src/main/webapp/WEB-INF/pages/courses/course-offerings.jsp