fragments
fragements2
Merge branch 'master' of https://github.com/kapuia/teamboston

Conflicts:
	src/hu/boston/tomorrow/activity/MainActivity.java