test
Merge branch 'master' of https://github.com/brandonisthebomb/Pilot

Conflicts:
	Pilot/app/src/main/java/com/Pilot/pilot/app/CoolButton.java