started login and register
started login and register
Merge branch 'master' of https://github.com/stefanNaumov/Fred-Flintstone

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/SportsEventsOrganizer/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/SportsEventsOrganizer/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3083986180.index
	.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	.metadata/version.ini
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/MainActivity.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$drawable.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$id.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$integer.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$layout.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$menu.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$string.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$style.class
	SportsEventsOrganizer/bin/classes/com/example/sportseventsorganizer/R$styleable.class
	appcompat_v7/bin/appcompat_v7.jar
added Login and Register activities