added settings
events happen when you click things on the list on the left
beginning to link frontend to backend
Merge branch 'master' into settings
backing up to be up to date with master
backing up one more time
Merge branch 'master' into settings
settings page does stuff