Merge branch 'master' of https://github.com/anitasantoso/burn-ios-app

Conflicts:
	burn-ios-app.xcodeproj/project.pbxproj
	burn-ios-app/Base.lproj/Main_.storyboard
	burn-ios-app/ViewController.h
	burn-ios-app/ViewController.m