modified:   DjangoApp/settings/local-dist.py
Merge branch 'master' of https://github.com/grengojbo/django-fiber-example
modified:   .gitignore
new file:   static/css/aplication.css
new file:   static/css/main.css
new file:   static/css/normalize.css
new file:   static/img/.gitignore
new file:   static/js/main.js
new file:   static/js/plugins.js
new file:   static/js/vendor/jquery-1.9.0.min.js
new file:   static/js/vendor/modernizr-2.6.2.min.js