merged with remote
Merge branch 'master' of https://github.com/joshuatj/buku555.git

Conflicts:
	buku555/src/Mail/Mailer.java
merged from remote
Merge branch 'master' of https://github.com/joshuatj/buku555

Conflicts:
	buku555/WebContent/getHistoricOtherCurrency.jsp
	buku555/WebContent/getHistoricRate.jsp
	buku555/WebContent/getRate.jsp
SplitBill Pin It! button is now using the correct orange class.

getHistoricOtherCurrency.jsp
getHistoricRate.jsp
getRate.jsp 
are correct now