Changing .gitignore
Added some responsive_grid code
Merge with master