my changes
something new
stupid git
doing stuff i shouldn't do?
Merge branch 'master' of https://github.com/bnbuanes/jordbrr
new level and a lot of testing
added merging files
some stuff in hellfire level added
merge all files
hellfire level changes
merge new stuff in commit
trying to get two cameras to work
addded all files in merge conflict
Merge branch 'master' of https://github.com/bnbuanes/jordbrr
hellmap files added
committed only userprefs
erged conflict