Changed wordings to test conflict
Deleted words to test conflict
Merge branch 'testconflict'

Conflicts:
	account.cpp
	bank.cpp