Merge remote-tracking branch 'upstream/develop' into develop
kjdfjhgfds
Merge remote-tracking branch 'upstream/develop' into develop

i need the files
album model
Merge pull request #15 from MarwanNakhaleh/develop

album model and merge-remote crap that apparently shows up in here as well