tmp
Merge branch 'master' of https://github.com/dj-nitehawk/Pandorian

Conflicts:
	Pandorian/My Project/Settings.Designer.vb