changed some of placing ships and added checking if space is occupied
Merge branch 'master' of https://github.com/ace8957/EECE6017C_FinalProject

Conflicts:
	application/setup.c