Actually including the layout directory this time
Merge branch 'master' of https://github.com/20twenty/FitHack

Conflicts:
	res/layout/activity_main.xml