fucking .DS_Store should be ignored now
merged with new database stuff
merge
adjusted styling on power options modal
adjusted power options modal
merged