Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser