added life altering code
Merge branch 'master' of https://github.com/otterdude97/cpp

Conflicts:
	.gitignore