some changes
some changes
merged pull request
sprockets again
resolved conflicts
cleaned up code, got rid of some unused files
stuff
resolving conflicts
made changes for mobile