test commit hahaha...
Merge branch 'master' of https://github.com/skflpoor/kjcodeTEST

Conflicts:
	kjcodeTEST/Base.lproj/Main.storyboard
merge????