committing files that we stashed and fixing conflicts
adding study page markup and routing [axof: 178]
committing changes to merged files when bdavis_start-stop-game
committing changes to merge clints branch
Added functionality to display and loop through definitions on study page [axof: 178]
merging files into master