Merge branch 'develop' of github.com:victorngkp/git-flow into develop
Added new file for afif_v1
Merge branch 'hotfix/jacktest'
sdasd
shin was here
Merge branch 'feature/afif_v1' of github.com:victorngkp/git-flow into feature/afif_v1
Mhahaahhahahaahahahahhaahahhaa erge branch 'develop' into feature/afif_v1

Conflicts:
	README.md
Merge pull request #1 from victorngkp/feature/afif_v1

Feature/afif v1