Importing bootstrap for android..
Merge branch 'master' of https://github.com/anetfreak/TodoStalker

Conflicts:
	bin/R.txt
	bin/TodoStalker.apk
	bin/classes.dex
	bin/classes/com/google/android/gms/R$attr.class
	bin/classes/com/google/android/gms/R$color.class
	bin/classes/com/google/android/gms/R$drawable.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/com/google/android/gms/R$string.class
	bin/classes/com/google/android/gms/R$styleable.class
	bin/classes/com/stalker/AddToDoActivity.class
	bin/classes/com/stalker/MainActivity.class
	bin/classes/com/stalker/R$attr.class
	bin/classes/com/stalker/R$color.class
	bin/classes/com/stalker/R$dimen.class
	bin/classes/com/stalker/R$drawable.class
	bin/classes/com/stalker/R$id.class
	bin/classes/com/stalker/R$integer.class
	bin/classes/com/stalker/R$layout.class
	bin/classes/com/stalker/R$menu.class
	bin/classes/com/stalker/R$string.class
	bin/classes/com/stalker/R$style.class
	bin/classes/com/stalker/R$styleable.class
	bin/dexedLibs/google-play-services-a7e20980e7c308deee095c654e4f2095.jar

bin/dexedLibs/google-play-services_lib-a6d8887177d238ef473365f9d8b7b2cb.
jar
	bin/resources.ap_
	gen/com/google/android/gms/R.java
	gen/com/stalker/R.java
	project.properties