committing detached head revision
Merge tag 'temp_tag' which was a former detached head#

Conflicts:
	frost.txt