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

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

# Conflicts:
#	app/src/main/java/com/example/admin/sleepbetter/FirstPage.java
#	app/src/main/java/com/example/admin/sleepbetter/SecondPage.java