Added bootstrap
Added git ignore
Merge branches 'dev' and 'master'
Removed pyc