added files
fixed big dan merge errors
fixed merge conflicts