added some more skeleton code to Timer
Merge branch 'master' of github.com:astraelly/simple-lol-timer

Conflicts:
	SimpleLoLTimer/SimpleLoLTimer.xcodeproj/project.pbxproj
	SimpleLoLTimer/SimpleLoLTimer/Timer.m