Created two separate directory buttons, one for web, one for non-web.
Cleaned up some small stuff
Merging branched files
Not sure what I'm doing here
Wtf gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bccmap/res/values/strings.xml