I dont know what I am committing right now
Closes #2
my first squash commit! Closes #5c9b02d
 added my teleportation device here, take care of it please!
fii
 am merging my things Merge branch 'master' of github.com:arjunanand/git-train
fixed conflict