Testing code
Merge branch 'AutomatedTabGeneration' of https://github.com/ericmvasey/GuitarTabs into AutomatedTabGeneration

Conflicts:
	GuitarTabs/src/com/jsongs/guitartabs/TabEditActivity.java