removing jquery; moving props into main
merging merges
removing ri* files
breaking display into multiple files
resolving merge conflict