merge complete
Merge branch 'master' of github.com:vossgang/captainskittles

commit after pulling from upstream
Merge remote-tracking branch 'upstream/master'
Add RIVCustomAlertViewController
Merge pull request #35 from Rivukis/master

Add custom alert view controller class
Merge remote-tracking branch 'origin/master'