Added first file
Added a new line to the file
Merge branch 'master' of github.com:potatoarecool/cs184