fixed URL
added question follow up
bug fix
.
heroku not working
ugh
abc
fixed broken things
added some fixes
for fun
Adding "whaaaaa"
12346
some changes
Merge branch 'master' of heroku.com:okaskme

Conflicts:
	ama_core.js
Merge branch 'master' of heroku.com:okaskme

Conflicts:
	images/.DS_Store