Merge pull request #1 from JonahMoses/staging

Merge Staging to Master
Merge pull request #2 from JonahMoses/staging

All tests passing, can create and view events
remove excess images