More notes woo
Merge branch 'master' of https://github.com/noobpurple/shiny-computing-machine

Conflicts:
	Text.txt