Some more cool changes to file 2
Merge remote-tracking branch 'origin/AwesomeChanges' into CoolEdits