merge
merge
Replaced shitty ajax with sexyness