Fixing indentation
Cleaning stuff up for git pull
Don't crash me bro
Adding nodemailer
Get the parent of a comment
Use better IP address system
adding more deps
Connecting to the email server
Fix merge conflicts?
Fix conflicts (again!)

Conflicts:
	apiV3/index.js
Adding a newline because I can
Merge branch 'development' into development-with-vagrant