commit
conflict
merge conflict
Merge branch 'master' of https://github.com/emintham/steelers
Merge branch 'master' of https://github.com/emintham/steelers
Merge branch 'master' of https://github.com/emintham/steelers
Gemfile
Merge branch 'master' of https://github.com/emintham/steelers
merge conflict
Merge branch 'master' of https://github.com/emintham/steelers
Merge branch 'master' of https://github.com/emintham/steelers
fixed bug in ls dyna job; minor aesthetic changes
Merge branch 'master' of https://github.com/emintham/steelers