adding new stuff
MergZZZZ branch 'master' of https://github.com/mukk88/cs470