Clean up continuing. Error on line 38
Error on line 38; dealing with merge errors
Error on line 38; dealing with merge errors
Merge branch 'master' of github.com:EDDISCODE/Edd-App
Errors with gitingnore.