# Conflicts:
#	app/src/main/java/com/codersanx/busview/MainActivity.kt
#	app/src/main/java/com/codersanx/busview/buses/Emulation.java
#	app/src/main/res/layout/activity_main.xml