renamed static to public
Merge branch 'master' of https://github.com/jakemhiller/a2-sandbox

Conflicts:
	public/bootstrap/css/bootstrap-responsive.css
	public/bootstrap/css/bootstrap-responsive.min.css
	public/bootstrap/css/bootstrap.css
	public/bootstrap/css/bootstrap.min.css
	public/bootstrap/img/glyphicons-halflings-white.png
	public/bootstrap/img/glyphicons-halflings.png
	public/bootstrap/js/bootstrap.js
	public/bootstrap/js/bootstrap.min.js
	public/javascripts/lib/jquery-1.7.2.min.js
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-icons_222222_256x240.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/images/ui-icons_ffffff_256x240.png
	public/javascripts/lib/jquery-ui/css/ui-lightness/jquery-ui-1.8.22.custom.css
	public/javascripts/lib/jquery-ui/js/jquery-ui-1.8.22.custom.min.js
	public/javascripts/lib/jquery-ui/readme.txt
	public/javascripts/lib/underscore-min.js
	public/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	public/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	public/jquery-ui/css/ui-lightness/images/ui-icons_222222_256x240.png
	public/jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png
	public/jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
	public/jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
	public/jquery-ui/css/ui-lightness/images/ui-icons_ffffff_256x240.png
	public/jquery-ui/css/ui-lightness/jquery-ui-1.8.22.custom.css
	public/jquery-ui/js/jquery-1.7.2.min.js
	public/jquery-ui/js/jquery-ui-1.8.22.custom.min.js
	public/jquery-ui/readme.txt
	public/js/underscore-min.js
	server.js
	static/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	static/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	static/jquery-ui/css/ui-lightness/images/ui-icons_222222_256x240.png
	static/jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png
	static/jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
	static/jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
	static/jquery-ui/css/ui-lightness/images/ui-icons_ffffff_256x240.png
	static/jquery-ui/css/ui-lightness/jquery-ui-1.8.22.custom.css
	static/jquery-ui/js/jquery-1.7.2.min.js
	static/jquery-ui/js/jquery-ui-1.8.22.custom.min.js
	static/jquery-ui/readme.txt
	static/js/underscore-min.js