trying
Some comment updates
Merge pull request #10 from huynhjjk/master

WebLabUX now using BootStrap 3
Adding documentation about the data api files

See how the files in the data folder are organized.
Merging in Mark's changes

This still needs some more work, but it's working enough for others to
use, so here it goes...
merging changes
April 22, 2014
Merging in  fixes to earlier pull request
Merge branch 'seattlemark-master'

Conflicts:
	assets/css/style.css
	templates/dynamicpages/allstudies.twig
	templates/layoutloggedin.twig
	templates/layoutloggedout.twig
Cleaning up the merge
Finally we have a working system!!!!

Checked in the changes that include the new all studies page and the
latest in .css files.

This should be downloaded by everyone before they do any coding!!!1
Added all the study periods to the sampleStudies

so we'll all have the same data
pulled the latest code from main weblabux repo