another commit
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/stoosevich/Symeetry
After git ignore fixed by Max.
Merge branch 'beacon'
DELETE THE FUCKING FUCK FUCKS
Merge branch 'master' of https://github.com/stoosevich/Symeetry

Conflicts:
	Symeetry.xcodeproj/project.xcworkspace/xcshareddata/Symeetry.xccheckout
move bluetooth functionality to separate class for time being. Add query to parse class to add new beacons to database