Conclict.

Author: dstegelman

MANIFEST.in

@@ -1,3 +1,4 @@
 include README.md
 recursive-include bootstrap/static *.*
 recursive-include bootstrap/templates *.*
+recursive-include fontawesome/static *.*

README.md

@@ -1,11 +1,24 @@
-django-bootstrap-static
-======================
+Django Bootstrap Static Files
+=============================
 
-Simply the bootstrap static files WITH plugins
+Bootstrap and optional Font Awesome static files ready for the picking.
 
 Install
 -------
 
 pip install django-bootstrap-static
 
-Add bootstrap to installed apps
+Configuration
+-------------
+
+To pickup bootstrap static files, simply inlcude 'boostrap' in your Intalled Apps.  You can also get Fontawesome support by adding 'fontawesome' to your installed apps.
+
+Please refer to each project for integration/install guides.
+
+Releases
+--------
+
+To keep with the bootstrap release schedule we will keep version numbers of this app in sync with the bootstrap Major.Minor.Revision changes.  The additional
+version number will be added at the end to denote a new change within this package itself.
+
+django-bootstrap-static==2.3.1.1 == bootstrap 2.3.1 with an additional package change.

fontawesome/__init__.py

@@ -0,0 +1,22 @@
+#Font Awesome 3.0.2
+##the iconic font designed for use with Twitter Bootstrap
+
+The full suite of pictographic icons, examples, and documentation can be found at:
+http://fortawesome.github.com/Font-Awesome/
+
+
+##License
+- The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+- Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - http://opensource.org/licenses/mit-license.html
+- The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+- Attribution is no longer required in Font Awesome 3.0, but much appreciated: "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
+
+##Contact
+- Email: dave@davegandy.com
+- Twitter: http://twitter.com/fortaweso_me
+- Work: Lead Product Designer @ http://kyru.us
+
+##Changelog
+- v3.0.0 - all icons redesigned from scratch, optimized for Bootstrap's 14px default
+- v3.0.1 - much improved rendering in webkit, various bugfixes
+- v3.0.2 - much improved rendering and alignment in IE7