set up
Merge branch 'master' of https://github.com/hselin/ola
Merge branch 'master' of https://github.com/hselin/ola
Merge branch 'master' of https://github.com/hselin/ola
Init gitignore
Merge branch 'master' of https://github.com/hselin/ola

Conflicts:
	Ola.xcodeproj/project.xcworkspace/xcshareddata/Ola.xccheckout
add gesture recognizer and instruction page
Merge pull request #1 from hselin/emergency

Emergency screens