Miscellaneous files.
Fixed .gitignore file.
Merge branch 'master' of https://github.com/EricTran5791/WeightConverter

Conflicts:
	.gitignore
	bin/dexedLibs/appcompat_v7-47c338d9c16864a9e8d1b38c2e54d71b.jar