Conflicts: 	.travis.yml
Conflicts:
	.travis.yml

BTA-BATA/BATA-SOURCE,JustinPercy/BATA-Development,JustinPercy/BATA-Development,BTA-BATA/BATA-SOURCE,BTA-BATA/BATA-SOURCE,BTA-BATA/BATA-SOURCE,JustinPercy/BATA-Development,JustinPercy/BATA-Development,JustinPercy/BATA-Development,BTA-BATA/BATA-SOURCE,BTA-BATA/BATA-SOURCE,JustinPercy/BATA-Development