Merge pull request #14 from rickmanelius/master

Adding /assets to .gitignore
Merge branch 'master' of github.com:rickmanelius/drupal-lamp