Recognizes types
Merge branch 'master' of https://github.com/madisonmay/LinkEd_Android

Conflicts:
	.idea/workspace.xml