unfucked changes
merged with gemisis
updates
fixed updates
more website updates
merged conflicts
merged remote
Merge branch 'jlpeyton'

merged with jlpeyton
added click event