modified
insignificant changes
merge
merge
Merge branch 'Aravind' of https://github.com/Samiam519/MafiaParty
merge
prof pic merge
merge
merge
used git correctly in order to merge changes without fucking everything up
merge settingIcons into master
 removed weird comment
revamped spritebuilder with flat design
changed some colors in spritebuilder
Can create a fucking user. Has bug where if the same fucking user logs in twice there are two fucking profiles created
Users are added and removed as necessary
added stories
commit before pulling
merged with updated Spritebuilder stuffs
I can't remember what I did.