Changing
Merge branch 'master' of https://github.com/linusx/KIFFMC

Conflicts:
	public/PayPal.log
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branches 'master' and 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Merge branch 'master' of https://github.com/linusx/KIFFMC
Blah