commtign todev
Merge branch 'master' into develop
deleted some files
Change in develop, will need to be merge
Revert "Change in develop, will need to be merge"

This reverts commit c48a32405a04640116a99f6e4e83e4ce91ad9c91.
will it?
commit to develop
Merge pull request #1 from ryanwalker/feature/INF-12345-new-dashboard

Feature/inf 12345 new dashboard
committing
fixed merge
changed in develop
change made in featuer branch
Fixed the problemo
Merge pull request #2 from ryanwalker/feature/awesome-thing

change made in featuer branch
First commit again
hi
another one of these commits
you said it
Merge pull request #3 from ryanwalker/feature/INF-12345-new-awesome

you said it
Conflict about to happen