stupid commit
Merge branch 'master' of https://github.com/tambien/GRID

Conflicts:
	style/main.css