Temp commit
Merge branch 'master' of https://github.com/JeppeKnockaert/SYTYCC
Fix for 502 error
Fix for 502 error
Merge branch 'master' of https://github.com/JeppeKnockaert/SYTYCC

Conflicts:
	app/src/main/java/com/sytycc/sytycc/app/MainActivity.java