Updated file_A to conflict with github version
Merge branch 'master' of github.com:pvi00/foundations6

Conflicts:
	file_A