commit
Merge remote-tracking branch 'origin/aakash' into aakash

Conflicts:
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$anim.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$attr.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$bool.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$color.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$dimen.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$drawable.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$id.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$integer.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$layout.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$string.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$style.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R$styleable.class
	TerraCallTimer/bin/classes/android/support/v7/appcompat/R.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/BuildConfig.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/MainActivity.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$anim.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$attr.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$bool.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$color.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$dimen.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$drawable.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$id.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$integer.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$layout.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$menu.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$string.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$style.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R$styleable.class
	TerraCallTimer/bin/classes/com/example/terracalltimer/R.class
	TerraCallTimer/bin/jarlist.cache
	TerraCallTimer/res/drawable-hdpi/ic_launcher.png
	TerraCallTimer/res/drawable-mdpi/ic_launcher.png
	TerraCallTimer/res/drawable-xhdpi/ic_launcher.png
	TerraCallTimer/res/layout/activity_main.xml
	TerraCallTimer/src/com/example/terracalltimer/MainActivity.java
	appcompat_v7/bin/appcompat_v7.jar
	appcompat_v7/bin/classes/android/support/v7/appcompat/BuildConfig.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$anim.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$attr.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$bool.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$color.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$dimen.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$drawable.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$id.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$integer.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$layout.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$string.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$style.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$styleable.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R.class