work in progress
Merge branch 'master' of github.com:jAlpedrinha/jalpedrinha.github.com

Conflicts:
	AdaptJS/.gitignore
	AdaptJS/README.txt
	AdaptJS/assets/css/1200.css
	AdaptJS/assets/css/1200.min.css
	AdaptJS/assets/css/1560.css
	AdaptJS/assets/css/1560.min.css
	AdaptJS/assets/css/1920.css
	AdaptJS/assets/css/1920.min.css
	AdaptJS/assets/css/2520.css
	AdaptJS/assets/css/2520.min.css
	AdaptJS/assets/css/720.css
	AdaptJS/assets/css/720.min.css
	AdaptJS/assets/css/960.css
	AdaptJS/assets/css/960.min.css
	AdaptJS/assets/css/master.css
	AdaptJS/assets/css/mobile.css
	AdaptJS/assets/css/mobile.min.css
	AdaptJS/assets/css/reset.css
	AdaptJS/assets/css/text.css
	AdaptJS/assets/images/h1.png
	AdaptJS/assets/js/adapt.js
	AdaptJS/assets/js/adapt.min.js
	AdaptJS/favicon.ico
	AdaptJS/humans.txt
	AdaptJS/index.html
	AdaptJS/test_class.html
	AdaptJS/test_id.html
	Building-A-Fixed-Position-Bottom-Menu.html
	GridSystem/.gitignore
	GridSystem/README.txt
	GridSystem/app_plugins/fireworks/960.gs Grid Commands.mxp
	GridSystem/app_plugins/fireworks/INSTALL.txt
	GridSystem/app_plugins/fireworks/_source/12 columns.jsf
	GridSystem/app_plugins/fireworks/_source/16 columns.jsf
	GridSystem/app_plugins/fireworks/_source/24 columns.jsf
	GridSystem/app_plugins/fireworks/_source/960.gs Grid Commands.mxi
	GridSystem/app_plugins/photoshop/960_GRIDS.atn
	GridSystem/app_plugins/photoshop/INSTALL.txt
	GridSystem/code/css/960.css
	GridSystem/code/css/960_12_col.css
	GridSystem/code/css/960_12_col_rtl.css
	GridSystem/code/css/960_16_col.css
	GridSystem/code/css/960_16_col_rtl.css
	GridSystem/code/css/960_24_col.css
	GridSystem/code/css/960_24_col_rtl.css
	GridSystem/code/css/960_rtl.css
	GridSystem/code/css/demo.css
	GridSystem/code/css/min/960.css
	GridSystem/code/css/min/960_12_col.css
	GridSystem/code/css/min/960_12_col_rtl.css
	GridSystem/code/css/min/960_16_col.css
	GridSystem/code/css/min/960_16_col_rtl.css
	GridSystem/code/css/min/960_24_col.css
	GridSystem/code/css/min/960_24_col_rtl.css
	GridSystem/code/css/min/960_rtl.css
	GridSystem/code/css/min/reset.css
	GridSystem/code/css/min/reset_rtl.css
	GridSystem/code/css/min/text.css
	GridSystem/code/css/min/text_rtl.css
	GridSystem/code/css/reset.css
	GridSystem/code/css/reset_rtl.css
	GridSystem/code/css/text.css
	GridSystem/code/css/text_rtl.css
	GridSystem/code/demo.html
	GridSystem/code/demo_24_col.html
	GridSystem/code/demo_24_col_rtl.html
	GridSystem/code/demo_rtl.html
	GridSystem/code/img/12_col.gif
	GridSystem/code/img/16_col.gif
	GridSystem/code/img/24_col.gif
	GridSystem/licenses/GPL_license.txt
	GridSystem/licenses/MIT_license.txt
	GridSystem/logo_files/960_logo.ai
	GridSystem/logo_files/960_logo.eps
	GridSystem/logo_files/960_logo.png
	GridSystem/logo_files/960_logo.psd
	GridSystem/logo_files/LOGO_USAGE.txt
	GridSystem/sketch_sheets/960_sketch_12_col.pdf
	GridSystem/sketch_sheets/960_sketch_16_col.pdf
	GridSystem/sketch_sheets/960_sketch_24_col.pdf
	GridSystem/sketch_sheets/960_sketch_all.pdf
	GridSystem/templates/acorn/960_grid_12_col.acorn
	GridSystem/templates/acorn/960_grid_16_col.acorn
	GridSystem/templates/acorn/960_grid_24_col.acorn
	GridSystem/templates/balsamiq/960_mockups.bmml
	GridSystem/templates/corel_draw/960_grid_12_col.cdt
	GridSystem/templates/corel_draw/960_grid_16_col.cdt
	GridSystem/templates/corel_draw/960_grid_24_col.cdt
	GridSystem/templates/expression_design/960_grid_12_col.design
	GridSystem/templates/expression_design/960_grid_16_col.design
	GridSystem/templates/expression_design/960_grid_24_col.design
	GridSystem/templates/fireworks/960_grid_12_col.png
	GridSystem/templates/fireworks/960_grid_16_col.png
	GridSystem/templates/fireworks/960_grid_24_col.png
	GridSystem/templates/flash/960_grid_12_col.fla
	GridSystem/templates/flash/960_grid_16_col.fla
	GridSystem/templates/flash/960_grid_24_col.fla
	GridSystem/templates/gimp/960_grid_12_col.xcf
	GridSystem/templates/gimp/960_grid_16_col.xcf
	GridSystem/templates/gimp/960_grid_24_col.xcf
	GridSystem/templates/illustrator/960_grid_12_col.ai
	GridSystem/templates/illustrator/960_grid_12_col_cs5.ait
	GridSystem/templates/illustrator/960_grid_16_col.ai
	GridSystem/templates/illustrator/960_grid_16_col_cs5.ait
	GridSystem/templates/illustrator/960_grid_24_col.ai
	GridSystem/templates/illustrator/960_grid_24_col_cs5.ait
	GridSystem/templates/indesign/cs3/960_grid_12_col.inx
	GridSystem/templates/indesign/cs3/960_grid_16_col.inx
	GridSystem/templates/indesign/cs3/960_grid_24_col.inx
	GridSystem/templates/indesign/cs4/960_grid_12_col.idml
	GridSystem/templates/indesign/cs4/960_grid_16_col.idml
	GridSystem/templates/indesign/cs4/960_grid_24_col.idml
	GridSystem/templates/indesign/cs5/960_grid_12_col.indt
	GridSystem/templates/indesign/cs5/960_grid_16_col.indt
	GridSystem/templates/indesign/cs5/960_grid_24_col.indt
	GridSystem/templates/inkscape/960_grid_12_col.svg
	GridSystem/templates/inkscape/960_grid_16_col.svg
	GridSystem/templates/inkscape/960_grid_24_col.svg
	GridSystem/templates/omnigraffle/960_graffle.graffle
	GridSystem/templates/photoshop/960_grid_12_col.psd
	GridSystem/templates/photoshop/960_grid_16_col.psd
	GridSystem/templates/photoshop/960_grid_24_col.psd
	GridSystem/templates/pixelmator/960_grid_12_col.pxm
	GridSystem/templates/pixelmator/960_grid_16_col.pxm
	GridSystem/templates/pixelmator/960_grid_24_col.pxm
	GridSystem/templates/quarkxpress/qxp_version_5/960_grid_12_col.qwd
	GridSystem/templates/quarkxpress/qxp_version_5/960_grid_16_col.qwd
	GridSystem/templates/quarkxpress/qxp_version_5/960_grid_24_col.qwd
	GridSystem/templates/quarkxpress/qxp_version_6/960_grid_12_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_6/960_grid_16_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_6/960_grid_24_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_7/960_grid_12_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_7/960_grid_16_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_7/960_grid_24_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_8/960_grid_12_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_8/960_grid_16_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_8/960_grid_24_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_9/960_grid_12_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_9/960_grid_16_col.qxp
	GridSystem/templates/quarkxpress/qxp_version_9/960_grid_24_col.qxp
	GridSystem/templates/visio/960_visio.vsd
	css/960.css
	css/960_12_col.css
	css/960_12_col_rtl.css
	css/960_16_col.css
	css/960_16_col_rtl.css
	css/960_24_col.css
	css/960_24_col_rtl.css
	css/960_rtl.css
	css/codestyle.css
	css/demo.css
	css/fonts/Philosopher.otf
	css/fonts/code.otf
	css/fonts/nevis.ttf
	css/min/960.css
	css/min/960_12_col.css
	css/min/960_12_col_rtl.css
	css/min/960_16_col.css
	css/min/960_16_col_rtl.css
	css/min/960_24_col.css
	css/min/960_24_col_rtl.css
	css/min/960_rtl.css
	css/min/reset.css
	css/min/reset_rtl.css
	css/min/text.css
	css/min/text_rtl.css
	css/reset.css
	css/reset_rtl.css
	css/text.css
	css/text_rtl.css
	index.html
	scripts/codestyle.js
	scripts/jquery.js
	teste.html