.gitignore updates
done with gitignore updating
Moved website files to /public/ dir
Merge branch 'dev'