Changed target version to API 21. Updated appcompact to v21. Changed theme to Material Design
Merge branch 'master' of github.com:AquaMorph/FRC-Manual

Conflicts:
	.gitignore
	FRCManual.iml