styling
more styling
merge fixes
styling changes
fixing merge issues
merge confilcts fix 1
fixing merge conflicts
merge conflicts fixed
Merge branch 'eric'
Merge pull request #3 from oheric/master

Master