1
Merge branch 'tmp_branch' of https://github.com/nevsaynev/DanceForHealth

Conflicts:
	.classpath
	AndroidManifest.xml
	README.md
	assets/2Dumb.ttf
	assets/3Dumb.ttf
	assets/ANUDRG__.ttf
	assets/BubblegumSans-Regular.otf
	assets/JUNEBUG_.ttf
	assets/KOMIKAX_.ttf
	assets/Komika_display.ttf
	assets/alpha_echo.ttf
	assets/comic_zine_ot.otf
	assets/helsinki.ttf
	ic_launcher-web.png
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
	res/layout/activity_dummy.xml
	res/layout/activity_graph.xml
	res/layout/activity_home.xml
	res/layout/activity_month_progress.xml
	res/layout/activity_new_workout.xml
	res/layout/activity_prev_workout.xml
	res/layout/activity_week_progress.xml
	res/layout/activity_workout_summary.xml
	res/layout/activity_year_progress.xml
	res/layout/footer.xml
	res/layout/header.xml
	res/layout/loading_screen.xml
	res/values-v11/styles.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/danceforhealth/DummyActivity.java
	src/com/example/danceforhealth/GraphActivity.java
	src/com/example/danceforhealth/HomeActivity.java
	src/com/example/danceforhealth/LoadingScreenActivity.java
	src/com/example/danceforhealth/MonthProgressActivity.java
	src/com/example/danceforhealth/MySimpleArrayAdapter.java
	src/com/example/danceforhealth/PrevWorkoutActivity.java
	src/com/example/danceforhealth/WeekProgressActivity.java
	src/com/example/danceforhealth/Workout.java
	src/com/example/danceforhealth/WorkoutSummary.java
	src/com/example/danceforhealth/YearProgressActivity.java