initial push
bootstrap created
conflict in schema resolved
pulled from laurie and sarah
pulling master branch
schema changed
starting second app
conflict fixed
Javascript folder
adding test template for ajax
saving script changes. Will add call with JSON file later
created new rails tmt app, got rid of tma app
conflicts resolved
merge to master conflict resolved
Merge branch 'angela'
deleted the extra migrations