added some wookmark stuff
Merge branch 'master' of github.com:dyep49/alex into development
added wookmark functionality
Merge branch 'master' of github.com:dyep49/alex into development