Agregue los iconos del action bar
Merge branch 'master' of https://github.com/fabianz66/Hackathon

Conflicts:
	BYND2015Hackathon/bin/BYND2015Hackathon.apk
	BYND2015Hackathon/bin/classes.dex

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/CustomAdapte
r.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/LoginActivit
y$3.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/LoginActivit
y$4.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/LoginActivit
y$5.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/LoginActivit
y$UserLoginTask.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$drawable.c
lass
	BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$id.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$layout.cla
ss

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$menu.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$string.cla
ss

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$style.clas
s

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/activities/L
oginActivity.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/activities/R
egisterActivity.class
	BYND2015Hackathon/bin/resources.ap_
	BYND2015Hackathon/gen/com/gotouch/bynd2015hackathon/R.java
	BYND2015Hackathon/res/values/strings.xml