finish
Merge branch 'master' of http://github.com/xhunterx89/sample_app