Minor changes that will be overwritten by merge later
Merged conflicts
Resolved conflict
Merge branch 'master' of github.com:cturkoanje/Redwood
Merging
Merge branch 'master' of github.com:cturkoanje/Redwood
Merging more stuff?