database updated
conflict removed
style.css changed
Merge branch 'development' of github.com:railskipl/drive into development
Merge branch 'development'