updated addContent branch with updates from master
Finished adding all the content
Removed extra return spaces
Merged with addContent branch. All content has now been added to the master and extra spaces removed.