resolving conflict
Merge branch 'development' of https://github.com/itskaytran/relationGame into development

Conflicts:
	bin/relationGameDebug.app/Contents/MacOS/relationGameDebug
Fetching information from various text files
Merge branch 'development' of https://github.com/itskaytran/relationGame into development

Conflicts:
	bin/data/characters/.DS_Store
Merged with latest changes
Touch ups on animation
Merge branch 'development' of https://github.com/itskaytran/relationGame into development
Merge with origin
Merge branch 'development' of https://github.com/itskaytran/relationGame into development