init comit ignore
merge
most of initial app
ignore uploads