Merge remote-tracking branch 'origin/master'

Conflicts:
	Space Invaders/Space Invaders.v11.suo
	Space Invaders/Space Invaders/Alien.cpp
	Space Invaders/Space Invaders/Alien.h
	Space Invaders/Space Invaders/AlienColumn.cpp
	Space Invaders/Space Invaders/Level.cpp
	Space Invaders/Space Invaders/Level.h
	Space Invaders/Space Invaders/PlayerShip.cpp
	Space Invaders/Space Invaders/PlayerShip.h
	Space Invaders/Space Invaders/Space Invaders.aps
	Space Invaders/Space Invaders/Space Invaders.rc
	Space Invaders/Space Invaders/Space Invaders.vcxproj
	Space Invaders/Space Invaders/Space Invaders.vcxproj.filters
	Space Invaders/Space Invaders/Thumbs.db
	Space Invaders/Space Invaders/resource.h