"updating"
Merge branch 'master' of https://github.com/irulenot/Tic-Tack-To
"Timer update!!"
Conflicts:
	jquery.js
Merge branch 'master' of https://github.com/irulenot/Tic-Tack-To
"Took away local js files, pushing timer"
Conflicts:
	jquery.js