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
relations on album
Merge remote-tracking branch 'upstream/develop' into develop

i need files br0
Merge pull request #16 from MarwanNakhaleh/develop

relations on album
Add sqlite and RSpec to the development and test groups
Merge pull request #17 from j3rn/develop

Added Devise and a Devise user
Merge pull request #18 from Icarurs/develop

Add sqlite and RSpec to the development and test groups
Add Haml and remove Slim from Gemfile
Add secret key base to allow server to work
Merge pull request #19 from Icarurs/develop

Add Haml and remove Slim from Gemfile