commit latest changes
tux007: 20141104 - Whiskey view controller
Wrote a custom view controller
Merge branch 'custom-view-controller'