committing before pulling
Merge branch 'master' of github.com:fijimunkii/hintr
location select styling
resolved merge conflict