adding to workflow
testing new commit on feature/workflow
this is a new feature
Merge pull request #6 from ipv1337/feature/workflow

adding to workflow
new code for demo
Merge pull request #12 from ipv1337/feature/demo

[rejected] new code for demo
my html is great!
new file
cmoy first test commit
Merge pull request #15 from cmoy/feature/newtestdemo

cmoy first test commit
Merge pull request #14 from ipv1337/feature/reallynew

new file
Merge pull request #16 from vijeshme/develop-change

my html is great!
hopefully this conflicts
lets conflict a merge
Merge pull request #17 from cmoy/feature/conflict

lets conflict a merge
fixed james to work with my new change
Merge pull request #8 from ipv1337/feature/newfile

this is a new feature
cleaning house