Cleaned up code after merging all branches, fixed spacing on resources, fixed HTML tags and CSS for events
Merge pull request #28 from suetingc/cleanup

Cleaned up code after merging all branches