Second commit
Merge https://github.com/jodiecarleton/BTS_Test

Conflicts:
	file1
Updated File 1