Removed bourbon, added objects and updated grid
Merge branch 'master' of https://github.com/mariojankovic/elevensixty-sass