commiting changes so I can pull new function to get username
Merge branch 'master' of https://github.com/shufan/weekendr
commiting in order to pull changes made to global
Merge branch 'master' of https://github.com/shufan/weekendr
added functions to global.js for events, started eventedit.js, fixed a few bugs in app.js