Practice adding/committing
New file
Creating conflict
Creating feature conflict
Resolved conflict
Trying to create new conflicts with branches
Merge branch 'master' of github.com:Reagankm/HelloWorld