Fixed css weirdness, .gitignore *.swp, collision set velocity=0
Turned off gravity
Merge branch 'feature/friction' into develop