First real commit
Merge branch 'master' of https://github.com/alkaline9500/243_Lab1

Conflicts:
	.gitignore