some
readded
deleted ignored files
added deploy scripts
fixed conflict