new file
something
new file
Delete newfile.txt
testing
Merge branch 'nicks' of github.com:nihunt/sriracha into nicks
Merge github.com:nihunt/sriracha into nicks
Delete anotherfile.txt
new
Delete something.txt
xyz
something
Merge pull request #1 from nihunt/nicks

Nicks