My uncommited changes
Merge branch 'master' of https://github.com/y0n1/CalCalc

Conflicts:
	public_html/HTML-CSS/css/elements.css
	public_html/HTML-CSS/css/hidpi.css
	public_html/HTML-CSS/css/style.css
	public_html/HTML-CSS/js/effects.jquery-ui.min.js
	public_html/HTML-CSS/js/jquery.colorbox.min.js
	public_html/HTML-CSS/js/jquery.min.js
	public_html/HTML-CSS/js/jquery.nivo-slider.min.js