meyer30: added NewWorkoutActivity
Changes to AndroidManifest, strings.xml and MainActivityTest
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy

Conflicts:
	WorkoutBuddy/AndroidManifest.xml
	WorkoutBuddy/res/values/strings.xml
	WorkoutBuddy/src/com/uiuc/workoutbuddy/MainActivity.java
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/MainActivityTest.java
Added Layouts, Tests cases and NewWorkoutActivity