finished password stuff!
Merge branch 'master' of https://github.com/vpreston/MediaShareProject