commit
commit
Merge branch 'gh-pages' of github.com:joelzyla/FSU into gh-pages
dfs
Conflicts:
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/b49cc06499abf8.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/bullsandbears.jpg
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/call.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/calltoaction.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/dust_bg.jpg
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/error.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/images/ajax-loader.gif
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/images/icons-18-black.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/images/icons-18-white.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/images/icons-36-black.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/images/icons-36-white.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/iphone_stats.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery-1.8.2.min.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile-1.2.0.min.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile-1.3.0.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile-1.3.0.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile-1.3.0.min.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile-1.3.0.min.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile.structure-1.3.0.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile.structure-1.3.0.min.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile.theme-1.3.0.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.mobile.theme-1.3.0.min.css
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/jquery.validate.min.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/json.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/logo.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/medical.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/modernizr.custom.min.js
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/noise_bg1.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/noise_bg2.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/politics.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/put.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/science.png
	ASD/Part 4/asdcouch/ASD Couch/app/_attachments/stock.png
	ASD/example/app/_attachments/style.css
Merge pull request #1 from joelzyla/master

trying to fix horrible git
Merge pull request #2 from joelzyla/gh-pages

pull