Fixed issue that caused hwclock to stop functioning.
Merge remote-tracking branch 'upstream/master'
add phpstorm files to gitignore