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 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
Merge branch 'master' into userInterface

Conflicts:
	css/pageViewer.css
	index.html
	js/pageViewer.js
Merge branch 'development' of github.com:CS-Worcester/CS401Spring2013 into userInterface

Conflicts:
	.DS_Store