Added merge file
change merging
more changes
Merge pull request #5 from johnwfoley/test

Test
made a conflict
new conflict
Update awesome_page.md
clearing up conflicts
new damn file
Merge branch 'master' into small_conflict
deleted New file