Merge branch 'fun'

Conflicts:
.gitignore
main.cpp
main.h
stl.h