changing settings to tims specs
update article to reflect tims new specs
updated article viewer and new main menus
add orantes article,media page, arrows for articles
add
Merge branch 'development' of github.com:CS-Worcester/CS401Spring2013 into user_interface
update puzzle
add slideshow
Merge branch 'development' of github.com:CS-Worcester/CS401Spring2013 into user_interface
add new image swaping technique for article/nadd article nav bar/nadd constant footer/n fix font size
add lightbox
test zoom function
fix zoom
add new images
coloring/index.html conflict resolve
conflict resolution
Merge pull request #22 from CS-Worcester/user_interface

Pull most current version in user_interface into development