add current concept with comment
add article viewer from personal repository
wamApp
coloringActivity
add new article view concept
add new article concept
fixed the height remove footer
Merge pull request #3 from CS-Worcester/puzzle

Added Puzzle
Jquery mobile directory fixed
Restoring index.html that got removed
Oops! Restored wrong file.
no Jquery mobile now
Merge pull request #5 from CS-Worcester/puzzle

Puzzle
Removed Jquery mobile Completly

Jquery mobile was yeilding unexpected results so it has been removed,
perhaps temporarily.  For now I don't think we will lose any
functionality by just using jquery.
Completely different slideshow. Based off of a template James found. Changes will be coming.
Sean
Merge pull request #6 from CS-Worcester/puzzle

Added Difficulty Option To Puzzle
Merge branch 'master' into development

Conflicts:
	.DS_Store
	coloring/WArtColor.js
	coloring/WArtColorStyle.css
	coloring/assets/.DS_Store
	coloring/assets/eraser.png
	coloring/index.html
	coloring/jquery-1.9.1.min.js
Jquery Mobile working and iPad panning fix

jQuery Mobile events are now working.
I implemented two fixes for disabling panning in the ipad browser. One
in javascript and one in jQuery mobile hopefully one will habe the
desired effect.
update user interface
update user interface