made tons of changes
Merge pull request #1 from zuniga7/stephen

made tons of changes
transitions between times
Merge pull request #4 from zuniga7/haziel

Haziel