folder
Merge branch 'master' of https://github.com/sburbidg/sea-c16-javascript into students/scottBurbidge
Merge branch 'students/scottBurbidge' of https://github.com/sburbidg/sea-c16-javascript

Conflicts:
	students/scottBurbidge