add this folder damn it
add this timer damn it
	new file:   local.properties
add
Merge branch 'master' of https://github.com/DisasterTimer/DisasterTimerNoni

add merge... will this work... maybe...