testing branch push
added border to textView and countdown timer
merge kenBranch and master