Merge pull request #1 from jivedesign/master

Trying to change project name
Added goals for course and semester
Merge pull request #2 from jwoo12/master

Added goals for course and semester
Merge remote-tracking branch 'upstream/master'

Merging user preferences to Jasmine's changes to model
Merge pull request #3 from jivedesign/master

added user pref activity
Changed UserPref to add xml and commented buggy code in CourseDataSource
Merge pull request #4 from jwoo12/master

Changed UserPref to add xml and commented buggy code in CourseDataSource
Overriding josh's local changes with Master
Merge remote-tracking branch 'upstream/master'
fixed issue referencing 4th column in Course