added vim shit to gitignore
style some shit
Merge branch 'master' of https://github.com/mhacks-nalostalati/obstaclr
houston we have logoz
fix merge conflicts
intro screen, colors done