Merge branch 'master' of https://github.com/adam01212/gb4ios5

Conflicts:
	README.md
update

update