responsive design done :)
Merge branch 'correct-responsive'