Merge branch 'master', remote-tracking branch 'origin' into lacoste
Merge branch 'master', remote-tracking branch 'origin' into lacoste
Merge branch 'master', remote-tracking branch 'origin' into lacoste
working base rspec tests for models
rspec
Merge branch 'master', remote-tracking branch 'origin' into lacoste
device stuff
spec tests
Merge branch 'master', remote-tracking branch 'origin' into lacoste
fixed factorygirl error
Merge branch 'master', remote-tracking branch 'origin' into lacoste
Merge branch 'Klopsch'
Merge branch 'Klopsch'
parks
Merge branch 'master', remote-tracking branch 'origin' into lacoste
updated README
changed park stylesheet
Merge branch 'Klopsch'
Fix merge
Remove avp route