Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/master' into Peter
minor change
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/Peter'
Merge remote-tracking branch 'origin/Vulkanmannen'
Merge remote-tracking branch 'origin/master' into Peter
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Shield.cpp
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Main.cpp
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Spiketrap
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/Shield.cpp
Spiketrap
Fireball/FireRune/Spiketrap
Merge remote-tracking branch 'origin/master' into Vulkanmannen

Conflicts:
	The Seekers Way 0.2/Shield.cpp
	The Seekers Way 0.2/Tottemaptest.png