FINALLY FIXED HTTPARTY
praise cat god
I am stupid d's are not t's
WHAT LANGUAGE ARE YOU?
before adding repo iteration
BEFORE I FUCK UP ALLWAYS COMMIT THEN BRANCH
JSON IS EMPTYYYY
update for test
for the tests
for the tests
for the tests
for the tests
asdf
post merge
fixed register
Merge remote-tracking branch 'upstream/master'

Conflicts:
	views/index.erb
	views/meta_data.erb
Fixed conflicts