main layout
Merge branch 'master' of https://github.com/bbbgscott/Black_Thorn.git

Conflicts:
	res/layout/main.xml