test
I have no idea what I just did
removed src folder
last working version before v1
updated gitignore
removed src folder
v.1, sorta`
Merge branch 'live'

Conflicts:
	js/fb.js
	js/hello.js