Merge pull request #1 from stjack99/master

Ignore Rubymine files (in .idea dir)
fixed dup javascript include tags
Merge branch 'master' of github.com:dnajd/middleman-loaded
Clear sample content
comments in demo scss
remove .col from demo
merge upstream
add many things