Added program activity and stab implementation of swipe mechanism. Small refactoring.
Merge branch 'master' of https://github.com/overriderb/gym3000

Conflicts:
	res/layout/menu_layout.xml