a bunch of shit even I dont remember what I changed
Merge branch 'develop' of https://github.com/ruahman/swipe-technologies into develop

Conflicts:
	API/api/app.py