first commit
added some text...
edit by Angus
i edited this yo
Merge https://github.com/nickyvee/NICK_VOGEL_ista_midterm