Updates to content
Merged changes
Merge #2
Merge #2
Still improving content
Added a holy sh#t slide