Commit 0.2
Commit 0.2
Merge origin/master

Conflicts:
	main.cpp