...
Merge branch 'master' of https://github.com/xwhiteknuckle22/Altimeter

Conflicts:
	.gitignore