init
Merge branch 'master' of github.com:cwnga/iphone_navigation_controller