The HTML
new eat and study files

added to the marist coding as well as made new objects for the user to
use
FInished study
study
club
class
Finished class
Hang with friends finished
video games finished
finished GYM
no change
Merge branch 'Marist-Game' of https://github.com/afrato/story into Marist-Game

Conflicts:
	marist.js
time.js
no change
deleted gym and videogames
Merge branch 'Marist-Game' of https://github.com/afrato/story into Marist-Game

Conflicts:
	marist.html
	marist.js
time still unfinished

working out bugs with the counter
time works
end-game is finished
Merge pull request #1 from afrato/Marist-Game

Marist game