Removed Zurb dependency, started working on prototype style separations, in the process of removing the sass cache to ignore in the future.
Fixing conflicts
Fixed conflict bug.
Changing a comment.