meyer30: delete com/example folder and moved files into com/uiuc folder.  Updated references
meyer30: delete com/example folder and moved files into com/uiuc folder.  Updated references
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy

Conflicts:
	WorkoutBuddy/res/layout/activity_new_workout.xml
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy