delete
merged
update .gitignore
Merge remote-tracking branch 'origin'

Conflicts:
	KiiBalanceApp/.DS_Store
refactoring and add comments