Core dumped error fixed
Merge branch 'master' of https://github.com/josejich/SOA_project0

Conflicts:
	main.c
Merge branch 'master' of https://github.com/josejich/SOA_project0