Changed time to 2
Merge branch 'master' of https://github.com/HalfdanJ/sfpcgit

# By Sarah GP
# Via Sarah GP
* 'master' of https://github.com/HalfdanJ/sfpcgit:
  Sarah added something else!

Conflicts:
	textfile.txt